Bug Fix And Appearence Edit