added support for tab key, improved layout, fixed targets bug

Change-Id: I859128c74b76209da95cda7db08344236c76e210