Removed unused methods and added support for tabs highlight.