Pretty up the webpage
Fix merge issues