Final changes: popup styling etc.