Cleaning up some UI stuff, fixed issues with building panel showing new unlock icon when it shouldnt