second commit

UI changes, added functionalities, error-checking added, remodeled file
structure