updated some UI & chanaged some file structures