Clean up UI and change theme colours

Fix ping bug