Reorganized code a bit
Created the two columns layout