major layout changes. some functionality added