Add events, fix layouts