Removed unused code
Added tabs ability.