Another round of merging - tabs implemented, waiting on styling