Added main page and navbar styling
merge