Added a couple of functionalities and app is starting to look good.