ui tweeks and bug fixs
File structure bug fixes ui tweeks