some updates.. mostly layout now