More front page changes
Fixed merge issues