UI integrated

some functions not yet working properly