fixed some core structure & usage, changed Tabs