Add more styling and UI