Further refined the UI