Cleaned up the init code to seperate interfaces. added 2 more tabs