restruture layout