Improving CSS & cleanup