layout improvement

Change-Id: I77e56e3c645d9055a97a31bf5ceeb0f087f1c836
hide unused variable

Change-Id: I8f5219585e79a177734200d196167153c566b751