Fixed some stuff in main screen