Several changes on frontend

Change-Id: I7313a011bd93db8b5748730b1db5834769195d08
Signed-off-by: Stephan <stegiemail-github@yahoo.de>