Layout changes
minor code changes

beginning to implement listeners and logic n such in java