Fixed a crash and some styling