added public controller & layout