Revert "Revert "Minor bug fixes and CSS update""

This reverts commit 077926dd65b0dc17f1b9dcef55a622211665c7bd.
Revert "Revert "Revert "Minor bug fixes and CSS update"""

This reverts commit 1c81fea5bc71050779727fae838417f74d2aa40a.
Revert "Revert "Revert "Revert "Minor bug fixes and CSS update""""

This reverts commit 05c87501772b34f56b589c14382c6abc9a21c664.