Update styles and fix width calculations #26