Organized and changed line ups to be more simple