UI Refactor

Major refactor of UI; still work to do..want to make it responsive to
all target system.