#23 bug fixes
#23 CSS fix
#23 CSS