Clean up + layout fix