Added jScrollPane; layout and functionality improvements