Finalize UI design :)