Slightly updated layout, javascripting