HassaanK - Fixed a little bit of UI. Did some refactoring.
Now the main thing left to do is UI fixes and maybe clean up the code.