starting to get things cleaned up for other screen sizes, etc.