Added tabbing funcitonality
fixed minor layouting issue
minor bugfixing and layouting