Fixes and CSS addition