added two panel layout
rebasing
fixed some styles