Combining the UI elements of both the versions

I hope this turns out gr8.