Remove unnecessary labels;
Fix Content layout