Fixed some visual problems + slight change