Final changes - css, bugs