Removed dragging, cleaned up layout