removes irrelevant location data
fixes some layouts
removes station parameter from Location
moves logic out to model