Completed Side layout
fixed merge conflicts