Added helper
Configured guard
Layout changes