Some older changes that were not committed. Also added buttons to homepage