Cleaned up all styling and placement