added spot for inactive state styles
merged changes