Updated Layout
Re-Factored and new features with file manipulation