Fixed html/css errors and fixed some layout issues