working more on UI
woo mostly working now