fixed null pointer exception
fixed view layout