Finish base tab widget and adjust code