adjusted layouts, removed repeating events from class events