Adding some more to the UI skeleton