Huge change - new layout

Added an new layout and huge changes to the script.