CSS refactor, fixed some layout resizing issues