Changed Appearance and Fixed Bugs