Simplify everything and add hide option
Layout