Change method name and layout fixes