code cleanups & added missing css class