fixed bugs with registration layout