Rearranged the station objects and added first simple popups