Add some slight design tweeks